Compare commits
10 Commits
master
...
handsomeju
Author | SHA1 | Date |
---|---|---|
zdj | 75eb5c1d6e | |
zdj | ab958525fb | |
zdj | 7f69e754f9 | |
zdj | 209538a9b3 | |
zdj | ad7ec6f562 | |
zdj | 276b9fa563 | |
zdj | 1ee6c349ae | |
zdj | 5529e81916 | |
zdj | c426a3efe8 | |
zdj | 2af6155249 |
|
@ -0,0 +1,88 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/3/16.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.MalformedURLException;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.net.URLConnection;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by wanglei on 2017/6/20.
|
||||||
|
* 根据百度地图API,根据地址得到经纬度
|
||||||
|
*/
|
||||||
|
public class AddressToLatitudeLongitude {
|
||||||
|
private String address = "哈尔滨";//地址
|
||||||
|
private double Latitude = 45.7732246332393;//纬度
|
||||||
|
private double Longitude = 126.65771685544611;//经度
|
||||||
|
|
||||||
|
public AddressToLatitudeLongitude(String addr_str) {
|
||||||
|
this.address = addr_str;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
*根据地址得到地理坐标
|
||||||
|
*/
|
||||||
|
public void getLatAndLngByAddress(){
|
||||||
|
String addr = "";
|
||||||
|
String lat = "";
|
||||||
|
String lng = "";
|
||||||
|
try {
|
||||||
|
addr = java.net.URLEncoder.encode(address,"UTF-8");//编码
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
String url = String.format("http://api.map.baidu.com/geocoder/v2/?"
|
||||||
|
+"address=%s&ak=4rcKAZKG9OIl0wDkICSLx8BA&output=json",addr);
|
||||||
|
URL myURL = null;
|
||||||
|
URLConnection httpsConn = null;
|
||||||
|
//进行转码
|
||||||
|
try {
|
||||||
|
myURL = new URL(url);
|
||||||
|
} catch (MalformedURLException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
<<<<<<< HEAD
|
||||||
|
// httpsConn = (URLConnection) myURL.openConnection();//建立连接
|
||||||
|
=======
|
||||||
|
httpsConn = (URLConnection) myURL.openConnection();//建立连接
|
||||||
|
>>>>>>> 7f69e754f933ab5ea326e502569b912a9177d2ff
|
||||||
|
if (httpsConn != null) {
|
||||||
|
InputStreamReader insr = new InputStreamReader(//传输数据
|
||||||
|
httpsConn.getInputStream(), "UTF-8");
|
||||||
|
BufferedReader br = new BufferedReader(insr);
|
||||||
|
String data = null;
|
||||||
|
if ((data = br.readLine()) != null) {
|
||||||
|
System.out.println(data);
|
||||||
|
//这里的data为以下的json格式字符串,因为简单,所以就不使用json解析了,直接字符串处理
|
||||||
|
//{"status":0,"result":{"location":{"lng":118.77807440802562,"lat":32.05723550180587},"precise":0,"confidence":12,"level":"城市"}}
|
||||||
|
lat = data.substring(data.indexOf("\"lat\":")+("\"lat\":").length(), data.indexOf("},\"precise\""));
|
||||||
|
lng = data.substring(data.indexOf("\"lng\":")+("\"lng\":").length(), data.indexOf(",\"lat\""));
|
||||||
|
}
|
||||||
|
insr.close();
|
||||||
|
br.close();
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
this.Latitude = Double.parseDouble(lat);
|
||||||
|
this.Longitude = Double.parseDouble(lng);
|
||||||
|
}
|
||||||
|
public Double getLatitude() {
|
||||||
|
return this.Latitude;
|
||||||
|
}
|
||||||
|
public Double getLongitude() {
|
||||||
|
return this.Longitude;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
AddressToLatitudeLongitude at = new AddressToLatitudeLongitude("安徽省亳州市亳州一中");
|
||||||
|
at.getLatAndLngByAddress();
|
||||||
|
System.out.println(at.getLatitude() + " " + at.getLongitude());
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
|
||||||
|
public class AlertDialog extends AppCompatActivity {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_login);
|
||||||
|
}
|
||||||
|
public void showdialog(View view)
|
||||||
|
{
|
||||||
|
//Toast.makeText(this,"clickme",Toast.LENGTH_LONG).show();
|
||||||
|
android.support.v7.app.AlertDialog.Builder alertdialogbuilder=new android.support.v7.app.AlertDialog.Builder(this);
|
||||||
|
alertdialogbuilder.setMessage("您确认要退出程序");
|
||||||
|
alertdialogbuilder.setPositiveButton("确定", click1);
|
||||||
|
alertdialogbuilder.setNegativeButton("取消", click2);
|
||||||
|
android.support.v7.app.AlertDialog alertdialog1=alertdialogbuilder.create();
|
||||||
|
alertdialog1.show();
|
||||||
|
}
|
||||||
|
private DialogInterface.OnClickListener click1=new DialogInterface.OnClickListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onClick(DialogInterface arg0,int arg1)
|
||||||
|
{
|
||||||
|
android.os.Process.killProcess(android.os.Process.myPid());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
private DialogInterface.OnClickListener click2=new DialogInterface.OnClickListener()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onClick(DialogInterface arg0,int arg1)
|
||||||
|
{
|
||||||
|
arg0.cancel();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
|
@ -95,13 +95,12 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
||||||
|
|
||||||
mLoginFormView = findViewById(R.id.login_form);
|
mLoginFormView = findViewById(R.id.login_form);
|
||||||
mProgressView = findViewById(R.id.login_progress);
|
mProgressView = findViewById(R.id.login_progress);
|
||||||
/* findViewById(R.id.login_button).setOnClickListener(new OnClickListener() {
|
findViewById(R.id.login_button).setOnClickListener(new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
startActivity(new Intent(LoginActivity.this,func_page.class));
|
startActivity(new Intent(LoginActivity.this,func_page.class));
|
||||||
}
|
}
|
||||||
});*/
|
});
|
||||||
//注册按钮
|
|
||||||
findViewById(R.id.register_button).setOnClickListener(new OnClickListener() {
|
findViewById(R.id.register_button).setOnClickListener(new OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
@ -132,9 +131,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
||||||
@TargetApi(Build.VERSION_CODES.M)
|
@TargetApi(Build.VERSION_CODES.M)
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
requestPermissions(new String[]{READ_CONTACTS}, REQUEST_READ_CONTACTS);
|
||||||
|
@ -205,27 +202,16 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
||||||
showProgress(true);
|
showProgress(true);
|
||||||
mAuthTask = new UserLoginTask(email, password);
|
mAuthTask = new UserLoginTask(email, password);
|
||||||
mAuthTask.execute((Void) null);
|
mAuthTask.execute((Void) null);
|
||||||
|
|
||||||
//这里加了一行,按需删除
|
|
||||||
startActivity(new Intent(LoginActivity.this,func_page.class));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
private boolean isEmailValid(String email) {
|
private boolean isEmailValid(String email) {
|
||||||
//TODO: Replace this with your own logic
|
//TODO: Replace this with your own logic
|
||||||
//这里改成自己的邮箱看看
|
return email.contains("@");
|
||||||
// return email.contains("@");
|
|
||||||
// return email.equals("admin@qq.com");
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isPasswordValid(String password) {
|
private boolean isPasswordValid(String password) {
|
||||||
//TODO: Replace this with your own logic
|
//TODO: Replace this with your own logic
|
||||||
//这里也换成自己的密码试试
|
return password.length() > 4;
|
||||||
// return password.equals("123456");
|
|
||||||
//return password.length() > 4;
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -372,10 +358,7 @@ public class LoginActivity extends AppCompatActivity implements LoaderCallbacks<
|
||||||
protected void onCancelled() {
|
protected void onCancelled() {
|
||||||
mAuthTask = null;
|
mAuthTask = null;
|
||||||
showProgress(false);
|
showProgress(false);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,297 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/3/16.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.ActionBarActivity;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.inputmethod.InputMethodManager;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.baidu.location.BDLocation;
|
||||||
|
import com.baidu.location.BDLocationListener;
|
||||||
|
import com.baidu.location.LocationClient;
|
||||||
|
import com.baidu.location.LocationClientOption;
|
||||||
|
import com.baidu.mapapi.SDKInitializer;
|
||||||
|
import com.baidu.mapapi.map.BaiduMap;
|
||||||
|
import com.baidu.mapapi.map.BitmapDescriptor;
|
||||||
|
import com.baidu.mapapi.map.BitmapDescriptorFactory;
|
||||||
|
import com.baidu.mapapi.map.MapStatusUpdate;
|
||||||
|
import com.baidu.mapapi.map.MapStatusUpdateFactory;
|
||||||
|
import com.baidu.mapapi.map.MapView;
|
||||||
|
import com.baidu.mapapi.map.MyLocationConfiguration;
|
||||||
|
import com.baidu.mapapi.map.MyLocationData;
|
||||||
|
import com.baidu.mapapi.model.LatLng;
|
||||||
|
|
||||||
|
public class MainActivity extends ActionBarActivity {
|
||||||
|
private MapView myMapView = null;//地图控件
|
||||||
|
private BaiduMap myBaiduMap;//百度地图对象
|
||||||
|
private LocationClient mylocationClient;//定位服务客户对象
|
||||||
|
private MylocationListener mylistener;//重写的监听类
|
||||||
|
private Context context;
|
||||||
|
|
||||||
|
private double myLatitude;//纬度,用于存储自己所在位置的纬度
|
||||||
|
private double myLongitude;//经度,用于存储自己所在位置的经度
|
||||||
|
private float myCurrentX;
|
||||||
|
|
||||||
|
private BitmapDescriptor myIconLocation1;//图标1,当前位置的箭头图标
|
||||||
|
// private BitmapDescriptor myIconLocation2;//图表2,前往位置的中心图标
|
||||||
|
|
||||||
|
private MyOrientationListener myOrientationListener;//方向感应器类对象
|
||||||
|
|
||||||
|
private MyLocationConfiguration.LocationMode locationMode;//定位图层显示方式
|
||||||
|
// private MyLocationConfiguration.LocationMode locationMode2;//定位图层显示方式
|
||||||
|
|
||||||
|
private LinearLayout myLinearLayout1; //经纬度搜索区域1
|
||||||
|
private LinearLayout myLinearLayout2; //地址搜索区域2
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
// requestWindowFeature(Window.FEATURE_NO_TITLE);
|
||||||
|
SDKInitializer.initialize(getApplicationContext());
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
this.context = this;
|
||||||
|
initView();
|
||||||
|
initLocation();
|
||||||
|
}
|
||||||
|
private void initView() {
|
||||||
|
myMapView = (MapView) findViewById(R.id.baiduMapView);
|
||||||
|
|
||||||
|
myBaiduMap = myMapView.getMap();
|
||||||
|
//根据给定增量缩放地图级别
|
||||||
|
MapStatusUpdate msu= MapStatusUpdateFactory.zoomTo(18.0f);
|
||||||
|
myBaiduMap.setMapStatus(msu);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initLocation() {
|
||||||
|
locationMode = MyLocationConfiguration.LocationMode.NORMAL;
|
||||||
|
|
||||||
|
//定位服务的客户端。宿主程序在客户端声明此类,并调用,目前只支持在主线程中启动
|
||||||
|
mylocationClient = new LocationClient(this);
|
||||||
|
mylistener = new MylocationListener();
|
||||||
|
|
||||||
|
//注册监听器
|
||||||
|
mylocationClient.registerLocationListener(mylistener);
|
||||||
|
//配置定位SDK各配置参数,比如定位模式、定位时间间隔、坐标系类型等
|
||||||
|
LocationClientOption mOption = new LocationClientOption();
|
||||||
|
//设置坐标类型
|
||||||
|
mOption.setCoorType("bd09ll");
|
||||||
|
//设置是否需要地址信息,默认为无地址
|
||||||
|
mOption.setIsNeedAddress(true);
|
||||||
|
//设置是否打开gps进行定位
|
||||||
|
mOption.setOpenGps(true);
|
||||||
|
//设置扫描间隔,单位是毫秒 当<1000(1s)时,定时定位无效
|
||||||
|
int span = 1000;
|
||||||
|
mOption.setScanSpan(span);
|
||||||
|
//设置 LocationClientOption
|
||||||
|
mylocationClient.setLocOption(mOption);
|
||||||
|
|
||||||
|
//初始化图标,BitmapDescriptorFactory是bitmap 描述信息工厂类.
|
||||||
|
//myIconLocation1 = BitmapDescriptorFactory.fromResource(R.drawable.location_marker);
|
||||||
|
// myIconLocation2 = BitmapDescriptorFactory.fromResource(R.drawable.icon_target);
|
||||||
|
|
||||||
|
//配置定位图层显示方式,三个参数的构造器
|
||||||
|
MyLocationConfiguration configuration
|
||||||
|
= new MyLocationConfiguration(locationMode, true, myIconLocation1);
|
||||||
|
//设置定位图层配置信息,只有先允许定位图层后设置定位图层配置信息才会生效,参见 setMyLocationEnabled(boolean)
|
||||||
|
myBaiduMap.setMyLocationConfigeration(configuration);
|
||||||
|
|
||||||
|
myOrientationListener = new MyOrientationListener(context);
|
||||||
|
//通过接口回调来实现实时方向的改变
|
||||||
|
myOrientationListener.setOnOrientationListener(new MyOrientationListener.OnOrientationListener() {
|
||||||
|
@Override
|
||||||
|
public void onOrientationChanged(float x) {
|
||||||
|
myCurrentX = x;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*创建菜单操作
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
|
||||||
|
getMenuInflater().inflate(R.menu.menu_item, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId())
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
*第一个功能,返回自己所在的位置,箭头表示
|
||||||
|
*/
|
||||||
|
case R.id.menu_item_mylocation://返回当前位置
|
||||||
|
getLocationByLL(myLatitude, myLongitude);
|
||||||
|
break;
|
||||||
|
|
||||||
|
/*
|
||||||
|
*第二个功能,根据经度和纬度前往位置
|
||||||
|
*/
|
||||||
|
case R.id.menu_item_llsearch://根据经纬度搜索地点
|
||||||
|
myLinearLayout1 = (LinearLayout) findViewById(R.id.linearLayout1);
|
||||||
|
//经纬度输入区域1可见
|
||||||
|
myLinearLayout1.setVisibility(View.VISIBLE);
|
||||||
|
final EditText myEditText_lg = (EditText) findViewById(R.id.editText_lg);
|
||||||
|
final EditText myEditText_la = (EditText) findViewById(R.id.editText_la);
|
||||||
|
Button button_ll = (Button) findViewById(R.id.button_llsearch);
|
||||||
|
|
||||||
|
button_ll.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
final double mylg = Double.parseDouble(myEditText_lg.getText().toString());
|
||||||
|
final double myla = Double.parseDouble(myEditText_la.getText().toString());
|
||||||
|
getLocationByLL(myla, mylg);
|
||||||
|
//隐藏前面经纬度输入区域
|
||||||
|
myLinearLayout1.setVisibility(View.GONE);
|
||||||
|
// Toast.makeText(context, "", Toast.LENGTH_SHORT).show();
|
||||||
|
//隐藏输入法键盘
|
||||||
|
InputMethodManager imm =(InputMethodManager)getSystemService(
|
||||||
|
Context.INPUT_METHOD_SERVICE);
|
||||||
|
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
|
/*
|
||||||
|
*第三个功能,根据地址名前往所在的位置
|
||||||
|
*/
|
||||||
|
case R.id.menu_item_sitesearch://根据地址搜索
|
||||||
|
myLinearLayout2 = (LinearLayout) findViewById(R.id.linearLayout2);
|
||||||
|
//显示地址搜索区域2
|
||||||
|
myLinearLayout2.setVisibility(View.VISIBLE);
|
||||||
|
final EditText myEditText_site = (EditText) findViewById(R.id.editText_site);
|
||||||
|
Button button_site = (Button) findViewById(R.id.button_sitesearch);
|
||||||
|
|
||||||
|
button_site.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
final String site_str = myEditText_site.getText().toString();
|
||||||
|
new Thread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
AddressToLatitudeLongitude at = new AddressToLatitudeLongitude(site_str);
|
||||||
|
at.getLatAndLngByAddress();
|
||||||
|
getLocationByLL(at.getLatitude(), at.getLongitude());
|
||||||
|
}
|
||||||
|
}).start();
|
||||||
|
//隐藏前面地址输入区域
|
||||||
|
myLinearLayout2.setVisibility(View.GONE);
|
||||||
|
//隐藏输入法键盘
|
||||||
|
InputMethodManager imm = (InputMethodManager) getSystemService(
|
||||||
|
Context.INPUT_METHOD_SERVICE);
|
||||||
|
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*根据经纬度前往
|
||||||
|
*/
|
||||||
|
public void getLocationByLL(double la, double lg)
|
||||||
|
{
|
||||||
|
//地理坐标的数据结构
|
||||||
|
LatLng latLng = new LatLng(la, lg);
|
||||||
|
//描述地图状态将要发生的变化,通过当前经纬度来使地图显示到该位置
|
||||||
|
MapStatusUpdate msu = MapStatusUpdateFactory.newLatLng(latLng);
|
||||||
|
myBaiduMap.setMapStatus(msu);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*定位请求回调接口
|
||||||
|
*/
|
||||||
|
public class MylocationListener implements BDLocationListener
|
||||||
|
{
|
||||||
|
//定位请求回调接口
|
||||||
|
private boolean isFirstIn=true;
|
||||||
|
//定位请求回调函数,这里面会得到定位信息
|
||||||
|
@Override
|
||||||
|
public void onReceiveLocation(BDLocation bdLocation) {
|
||||||
|
//BDLocation 回调的百度坐标类,内部封装了如经纬度、半径等属性信息
|
||||||
|
//MyLocationData 定位数据,定位数据建造器
|
||||||
|
/*
|
||||||
|
* 可以通过BDLocation配置如下参数
|
||||||
|
* 1.accuracy 定位精度
|
||||||
|
* 2.latitude 百度纬度坐标
|
||||||
|
* 3.longitude 百度经度坐标
|
||||||
|
* 4.satellitesNum GPS定位时卫星数目 getSatelliteNumber() gps定位结果时,获取gps锁定用的卫星数
|
||||||
|
* 5.speed GPS定位时速度 getSpeed()获取速度,仅gps定位结果时有速度信息,单位公里/小时,默认值0.0f
|
||||||
|
* 6.direction GPS定位时方向角度
|
||||||
|
* */
|
||||||
|
myLatitude = bdLocation.getLatitude();
|
||||||
|
myLongitude = bdLocation.getLongitude();
|
||||||
|
MyLocationData data = new MyLocationData.Builder()
|
||||||
|
.direction(myCurrentX)//设定图标方向
|
||||||
|
.accuracy(bdLocation.getRadius())//getRadius 获取定位精度,默认值0.0f
|
||||||
|
.latitude(myLatitude)//百度纬度坐标
|
||||||
|
.longitude(myLongitude)//百度经度坐标
|
||||||
|
.build();
|
||||||
|
//设置定位数据, 只有先允许定位图层后设置数据才会生效,参见 setMyLocationEnabled(boolean)
|
||||||
|
myBaiduMap.setMyLocationData(data);
|
||||||
|
|
||||||
|
//判断是否为第一次定位,是的话需要定位到用户当前位置
|
||||||
|
if (isFirstIn) {
|
||||||
|
//根据当前所在位置经纬度前往
|
||||||
|
getLocationByLL(myLatitude, myLongitude);
|
||||||
|
isFirstIn = false;
|
||||||
|
//提示当前所在地址信息
|
||||||
|
// Toast.makeText(context, bdLocation.getAddrStr(), Toast.LENGTH_SHORT).show();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*定位服务的生命周期,达到节省
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
protected void onStart() {
|
||||||
|
super.onStart();
|
||||||
|
//开启定位,显示位置图标
|
||||||
|
myBaiduMap.setMyLocationEnabled(true);
|
||||||
|
if(!mylocationClient.isStarted())
|
||||||
|
{
|
||||||
|
mylocationClient.start();
|
||||||
|
}
|
||||||
|
|
||||||
|
myOrientationListener.start();
|
||||||
|
// getLocationByLL(117.11,40.2);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void onStop() {
|
||||||
|
super.onStop();
|
||||||
|
//停止定位
|
||||||
|
myBaiduMap.setMyLocationEnabled(false);
|
||||||
|
mylocationClient.stop();
|
||||||
|
myOrientationListener.stop();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
myMapView.onResume();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
myMapView.onPause();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
myMapView.onDestroy();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,116 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/4/3.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import android.support.v7.app.ActionBarActivity;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.View.OnClickListener;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import android.widget.TextView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.Message;
|
||||||
|
|
||||||
|
public class Mainactivity1 extends ActionBarActivity implements OnClickListener{
|
||||||
|
UDPSocketClientManage socketClientManage = null;
|
||||||
|
private String mstrDataString="";
|
||||||
|
private TextView textViewRecrive;
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.udp_main);
|
||||||
|
|
||||||
|
|
||||||
|
findViewById(R.id.button1).setOnClickListener(this);
|
||||||
|
findViewById(R.id.button2).setOnClickListener(this);
|
||||||
|
findViewById(R.id.button3).setOnClickListener(this);
|
||||||
|
TextView loTextView = (TextView)findViewById(R.id.textViewLoca);
|
||||||
|
|
||||||
|
//手机端的连接路由之后IP地址,网络调试助手向目标主机发送的IP地址就是这里获取出来的
|
||||||
|
String strLoString = UDPSocketClientManage.getLocalIpAddress();
|
||||||
|
if (strLoString != null) {
|
||||||
|
loTextView.setText(strLoString);
|
||||||
|
}
|
||||||
|
textViewRecrive = (TextView)findViewById(R.id.textViewRecrive);
|
||||||
|
|
||||||
|
socketClientManage = new UDPSocketClientManage();
|
||||||
|
socketClientManage.RegSocketConnectListener(new SocketConnectListener() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void OnReceiverCallBack(int nLength, byte[] data) {
|
||||||
|
mstrDataString = new String(data);
|
||||||
|
mHandler.sendEmptyMessage(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void OnConnectStatusCallBack(NetworkState networkState) {
|
||||||
|
switch (networkState) {
|
||||||
|
case NETWORK_STATE_CONNECT_SUCCEED:
|
||||||
|
mHandler.sendEmptyMessage(0);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Handler mHandler = new Handler() {
|
||||||
|
@Override
|
||||||
|
public void handleMessage(Message msg) {
|
||||||
|
super.handleMessage(msg);
|
||||||
|
switch (msg.what) {
|
||||||
|
case 0: // 接受到消息之后,对UI控件进行修改
|
||||||
|
Toast.makeText(Mainactivity1.this, "连接成功", Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
case 1: // 接受到消息之后,对UI控件进行修改
|
||||||
|
textViewRecrive.append(mstrDataString);
|
||||||
|
Toast.makeText(Mainactivity1.this, mstrDataString, Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
switch (v.getId()) {
|
||||||
|
case R.id.button1:
|
||||||
|
new Thread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
socketClientManage.Connect();
|
||||||
|
|
||||||
|
}
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
break;
|
||||||
|
case R.id.button2:
|
||||||
|
EditText ipEditText = (EditText)findViewById(R.id.editText1);
|
||||||
|
EditText porText = (EditText)findViewById(R.id.editText2);
|
||||||
|
String ipString = ipEditText.getText().toString().trim();
|
||||||
|
String portString = porText.getText().toString().trim();
|
||||||
|
socketClientManage.setNetworkParameter(ipString, portString != null ? Integer.parseInt(portString) : 0);
|
||||||
|
Toast.makeText(Mainactivity1.this, "设置成功", Toast.LENGTH_SHORT).show();
|
||||||
|
break;
|
||||||
|
case R.id.button3:
|
||||||
|
EditText sendEditText = (EditText)findViewById(R.id.editText3);
|
||||||
|
String sendDataString = sendEditText.getText().toString().trim();
|
||||||
|
if(sendDataString != null)
|
||||||
|
socketClientManage.send(sendDataString.getBytes(), sendDataString.getBytes().length);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
}}
|
|
@ -0,0 +1,91 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/3/16.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
import android.hardware.Sensor;
|
||||||
|
import android.hardware.SensorEvent;
|
||||||
|
import android.hardware.SensorEventListener;
|
||||||
|
import android.hardware.SensorManager;
|
||||||
|
|
||||||
|
public class MyOrientationListener implements SensorEventListener{
|
||||||
|
|
||||||
|
private SensorManager mSensorManager;
|
||||||
|
private Sensor mSensor;
|
||||||
|
private Context mContext;
|
||||||
|
private float lastX;
|
||||||
|
private OnOrientationListener mOnOrientationListener;
|
||||||
|
|
||||||
|
public MyOrientationListener(Context context)
|
||||||
|
{
|
||||||
|
this.mContext=context;
|
||||||
|
}
|
||||||
|
public void start()
|
||||||
|
{
|
||||||
|
mSensorManager= (SensorManager) mContext
|
||||||
|
.getSystemService(Context.SENSOR_SERVICE);
|
||||||
|
if(mSensorManager!= null)
|
||||||
|
{
|
||||||
|
//获得方向传感器
|
||||||
|
mSensor=mSensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION);
|
||||||
|
}
|
||||||
|
//判断是否有方向传感器
|
||||||
|
<<<<<<< HEAD
|
||||||
|
// if(mSensor!=null)
|
||||||
|
// {
|
||||||
|
// //注册监听器
|
||||||
|
// mSensorManager.registerListener(this,mSensor,SensorManager.SENSOR_DELAY_UI);
|
||||||
|
|
||||||
|
// }
|
||||||
|
=======
|
||||||
|
if(mSensor!=null)
|
||||||
|
{
|
||||||
|
//注册监听器
|
||||||
|
mSensorManager.registerListener(this,mSensor,SensorManager.SENSOR_DELAY_UI);
|
||||||
|
|
||||||
|
}
|
||||||
|
>>>>>>> 7f69e754f933ab5ea326e502569b912a9177d2ff
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
public void stop()
|
||||||
|
{
|
||||||
|
mSensorManager.unregisterListener(this);
|
||||||
|
|
||||||
|
}
|
||||||
|
//方向改变
|
||||||
|
@Override
|
||||||
|
public void onSensorChanged(SensorEvent event) {
|
||||||
|
if(event.sensor.getType()==Sensor.TYPE_ORIENTATION)
|
||||||
|
{
|
||||||
|
float x=event.values[SensorManager.DATA_X];
|
||||||
|
if(Math.abs(x-lastX)>1.0)
|
||||||
|
{
|
||||||
|
if(mOnOrientationListener!=null)
|
||||||
|
{
|
||||||
|
mOnOrientationListener.onOrientationChanged(x);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastX=x;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
public void setOnOrientationListener(OnOrientationListener listener)
|
||||||
|
{
|
||||||
|
mOnOrientationListener=listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface OnOrientationListener
|
||||||
|
{
|
||||||
|
void onOrientationChanged(float x);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAccuracyChanged(Sensor sensor, int accuracy) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/4/3.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public enum NetworkState {
|
||||||
|
NETWORK_STATE_NULL, // 无状态
|
||||||
|
NETWORK_STATE_CONNECT_SUCCEED, // 网络连接成功
|
||||||
|
NETWORK_STATE_DISCONNECT_SUCCEED, // 网络断开成功(自身断开)
|
||||||
|
NETWORK_STATE_SERVER_DISCONNECT, // 网络被服务器断开
|
||||||
|
NETWORK_STATE_CONNECT_FAILLD, // 连接服务器失败,IP/端口不正常
|
||||||
|
NETWORK_STATE_CONNECT_ING, // 正在连接过程中...
|
||||||
|
NETWORK_STATE_RXD, // 接收数据
|
||||||
|
NETWORK_STATE_TXD; // 发送数据
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,14 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/4/3.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public abstract class SocketConnectListener {
|
||||||
|
// 网络状态回调
|
||||||
|
public abstract void OnConnectStatusCallBack(NetworkState networkState);
|
||||||
|
|
||||||
|
// 接收数据回调
|
||||||
|
public abstract void OnReceiverCallBack(int nLength, byte[] data);
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,209 @@
|
||||||
|
package com.example.administrator.myapp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by 小老宰 on 2018/4/3.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.DatagramPacket;
|
||||||
|
import java.net.DatagramSocket;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.NetworkInterface;
|
||||||
|
import java.net.SocketException;
|
||||||
|
import java.net.UnknownHostException;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
public class UDPSocketClientManage {
|
||||||
|
// 服务器IP
|
||||||
|
private static String SERVER_IP = "192.168.43.156";
|
||||||
|
// 服务器端口
|
||||||
|
private static int LOCAL_PORT_AUDIO = 8080;
|
||||||
|
// 接收数据包
|
||||||
|
private DatagramPacket Packet_Receive;
|
||||||
|
// 端口
|
||||||
|
private DatagramSocket msocketClient;
|
||||||
|
|
||||||
|
NetworkState mLastNetworkState = NetworkState.NETWORK_STATE_NULL;
|
||||||
|
SocketConnectListener mConnectListener = null;
|
||||||
|
|
||||||
|
// 设置网络连接参数
|
||||||
|
public void setNetworkParameter(String strIP, int nPort) {
|
||||||
|
SERVER_IP = strIP;
|
||||||
|
LOCAL_PORT_AUDIO = nPort;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 注册接收连接状态和数据的回调函数
|
||||||
|
public void RegSocketConnectListener(SocketConnectListener listener) {
|
||||||
|
mConnectListener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 启动连接服务器
|
||||||
|
*/
|
||||||
|
public void Connect() {
|
||||||
|
// 正在开始连接
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_CONNECT_ING;
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 端口
|
||||||
|
msocketClient = new DatagramSocket(LOCAL_PORT_AUDIO);
|
||||||
|
// 接收数据缓存
|
||||||
|
byte[] Buffer_Receive = new byte[1024];
|
||||||
|
// 接收包
|
||||||
|
Packet_Receive = new DatagramPacket(Buffer_Receive,1024);
|
||||||
|
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_CONNECT_SUCCEED;
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_CONNECT_FAILLD;
|
||||||
|
Log.e("Show", e.toString());
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (Exception e) {
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_CONNECT_FAILLD;
|
||||||
|
Log.e("Show", e.toString());
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 向回调发数据
|
||||||
|
if (null != mConnectListener) {
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (msocketClient != null) {
|
||||||
|
new Thread(reRunnable).start();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Runnable reRunnable = new Runnable() {
|
||||||
|
@SuppressLint("NewApi") @Override
|
||||||
|
public void run() {
|
||||||
|
while (true) {
|
||||||
|
try {
|
||||||
|
// 接收数据
|
||||||
|
if (Packet_Receive != null) {
|
||||||
|
msocketClient.receive(Packet_Receive);
|
||||||
|
|
||||||
|
// 判断数据是否合法
|
||||||
|
InetSocketAddress address = (InetSocketAddress) Packet_Receive.getSocketAddress();
|
||||||
|
// 判断是否是调度服务器的ip
|
||||||
|
if (!address.getHostName().equals(SERVER_IP)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 判断是否是调度服务器的端口
|
||||||
|
if (address.getPort() != LOCAL_PORT_AUDIO) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
int length = Packet_Receive.getLength();
|
||||||
|
if (length > 0)
|
||||||
|
mConnectListener.OnReceiverCallBack(length, Packet_Receive.getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
Log.e("Show", e.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 断开连接
|
||||||
|
*/
|
||||||
|
public void Close() {
|
||||||
|
if (msocketClient != null) {
|
||||||
|
msocketClient = null;
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_DISCONNECT_SUCCEED;
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 发送数据
|
||||||
|
* @param data
|
||||||
|
* :需要发送的数据
|
||||||
|
* @param len
|
||||||
|
* :数据字节数据
|
||||||
|
*/
|
||||||
|
public void send(byte[] data, int len) {
|
||||||
|
Thread_Send thread_send = new Thread_Send(data, len);
|
||||||
|
new Thread(thread_send).start();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 发送线程
|
||||||
|
*/
|
||||||
|
private class Thread_Send implements Runnable {
|
||||||
|
// 发送数据缓存
|
||||||
|
private byte[] Buffer_Send = new byte[1024];
|
||||||
|
// 发送数据包
|
||||||
|
private DatagramPacket Packet_Send;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief 构造函数
|
||||||
|
* @param data
|
||||||
|
* :需要发送的数据
|
||||||
|
* @param len
|
||||||
|
* :数据字节数据
|
||||||
|
*/
|
||||||
|
public Thread_Send(byte[] data, int len) {
|
||||||
|
// 发送包
|
||||||
|
Packet_Send = new DatagramPacket(Buffer_Send,1024);
|
||||||
|
Packet_Send.setData(data);
|
||||||
|
Packet_Send.setLength(len);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
Packet_Send.setPort(LOCAL_PORT_AUDIO);
|
||||||
|
Packet_Send.setAddress(InetAddress.getByName(SERVER_IP));
|
||||||
|
if (msocketClient != null) {
|
||||||
|
msocketClient.send(Packet_Send);
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_TXD;
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
}else {
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_NULL;
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (UnknownHostException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_NULL;
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
mLastNetworkState = NetworkState.NETWORK_STATE_NULL;
|
||||||
|
mConnectListener.OnConnectStatusCallBack(mLastNetworkState);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取最后的网络状态
|
||||||
|
public NetworkState getLastNetworkState() {
|
||||||
|
return mLastNetworkState;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getLocalIpAddress() {
|
||||||
|
try {
|
||||||
|
for (Enumeration<NetworkInterface> en = NetworkInterface
|
||||||
|
.getNetworkInterfaces(); en.hasMoreElements();) {
|
||||||
|
NetworkInterface intf = en.nextElement();
|
||||||
|
for (Enumeration<InetAddress> enumIpAddr = intf
|
||||||
|
.getInetAddresses(); enumIpAddr.hasMoreElements();) {
|
||||||
|
InetAddress inetAddress = enumIpAddr.nextElement();
|
||||||
|
if (!inetAddress.isLoopbackAddress()
|
||||||
|
&& !inetAddress.isLinkLocalAddress()) {
|
||||||
|
return inetAddress.getHostAddress().toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (SocketException ex) {
|
||||||
|
Log.e("WifiPreference IpAddress", ex.toString());
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
|
@ -21,7 +21,7 @@ public class func_page extends AppCompatActivity {
|
||||||
findViewById(R.id.locate_button).setOnClickListener(new View.OnClickListener() {
|
findViewById(R.id.locate_button).setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
startActivity(new Intent(func_page.this,locate_page.class));
|
startActivity(new Intent(func_page.this,MainActivity.class));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
findViewById(R.id.address_button).setOnClickListener(new View.OnClickListener() {
|
findViewById(R.id.address_button).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@ -30,6 +30,12 @@ public class func_page extends AppCompatActivity {
|
||||||
startActivity(new Intent(func_page.this,my_address_page.class));
|
startActivity(new Intent(func_page.this,my_address_page.class));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
findViewById(R.id.information_button).setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
startActivity(new Intent(func_page.this,Mainactivity1.class));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,22 +4,20 @@ import android.app.Activity;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.support.v7.app.AlertDialog;
|
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
import com.baidu.mapapi.SDKInitializer;
|
import android.support.v7.app.AppCompatActivity;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.View;
|
||||||
|
|
||||||
public class locate_page extends Activity {
|
public class locate_page extends Activity {
|
||||||
private Spinner myspinner;
|
private Spinner myspinner;
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
SDKInitializer.initialize(getApplicationContext());
|
|
||||||
setContentView(R.layout.activity_locate_page);
|
setContentView(R.layout.activity_locate_page);
|
||||||
|
|
||||||
myspinner= (Spinner) findViewById(R.id.goods_list);
|
myspinner= (Spinner) findViewById(R.id.goods_list);
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 204 KiB |
|
@ -1 +0,0 @@
|
||||||
#Wed Aug 30 19:34:01 CST 2017
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,15 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CheckStyle-IDEA">
|
|
||||||
<option name="configuration">
|
|
||||||
<map>
|
|
||||||
<entry key="checkstyle-version" value="8.2" />
|
|
||||||
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
|
|
||||||
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
|
|
||||||
<entry key="scan-before-checkin" value="false" />
|
|
||||||
<entry key="scanscope" value="JavaOnly" />
|
|
||||||
<entry key="suppress-errors" value="false" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module external.linked.project.id="Notes-master-original" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="java-gradle" name="Java-Gradle">
|
|
||||||
<configuration>
|
|
||||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
|
||||||
<option name="BUILDABLE" value="false" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="inheritedJdk" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
|
@ -1,19 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module external.linked.project.id="Notes-master1" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="java-gradle" name="Java-Gradle">
|
|
||||||
<configuration>
|
|
||||||
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
|
|
||||||
<option name="BUILDABLE" value="false" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
|
@ -1,21 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
|
||||||
<configuration>
|
|
||||||
<option name="GRADLE_PROJECT_PATH" value=":" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
<facet type="android" name="Android">
|
|
||||||
<configuration>
|
|
||||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$" />
|
|
||||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
|
@ -1,99 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
|
|
||||||
<component name="FacetManager">
|
|
||||||
<facet type="android-gradle" name="Android-Gradle">
|
|
||||||
<configuration>
|
|
||||||
<option name="GRADLE_PROJECT_PATH" value=":app" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
<facet type="android" name="Android">
|
|
||||||
<configuration>
|
|
||||||
<option name="SELECTED_BUILD_VARIANT" value="debug" />
|
|
||||||
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
|
|
||||||
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
|
|
||||||
<afterSyncTasks>
|
|
||||||
<task>generateDebugSources</task>
|
|
||||||
</afterSyncTasks>
|
|
||||||
<option name="ALLOW_USER_CONFIGURATION" value="false" />
|
|
||||||
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
|
|
||||||
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
|
|
||||||
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
|
|
||||||
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
|
|
||||||
</configuration>
|
|
||||||
</facet>
|
|
||||||
</component>
|
|
||||||
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
|
|
||||||
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
|
|
||||||
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
|
|
||||||
<exclude-output />
|
|
||||||
<content url="file://$MODULE_DIR$">
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
|
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
|
||||||
</content>
|
|
||||||
<orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
|
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
|
||||||
</component>
|
|
||||||
</module>
|
|
|
@ -1,19 +0,0 @@
|
||||||
apply plugin: 'com.android.application'
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdkVersion 18
|
|
||||||
buildToolsVersion "26.0.1"
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
applicationId "net.micode.notes"
|
|
||||||
minSdkVersion 14
|
|
||||||
targetSdkVersion 14
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
minifyEnabled false
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
/**
|
|
||||||
* Automatically generated file. DO NOT MODIFY
|
|
||||||
*/
|
|
||||||
package net.micode.notes.test;
|
|
||||||
|
|
||||||
public final class BuildConfig {
|
|
||||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
|
||||||
public static final String APPLICATION_ID = "net.micode.notes.test";
|
|
||||||
public static final String BUILD_TYPE = "debug";
|
|
||||||
public static final String FLAVOR = "";
|
|
||||||
public static final int VERSION_CODE = -1;
|
|
||||||
public static final String VERSION_NAME = "";
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
/**
|
|
||||||
* Automatically generated file. DO NOT MODIFY
|
|
||||||
*/
|
|
||||||
package net.micode.notes;
|
|
||||||
|
|
||||||
public final class BuildConfig {
|
|
||||||
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
|
||||||
public static final String APPLICATION_ID = "net.micode.notes";
|
|
||||||
public static final String BUILD_TYPE = "debug";
|
|
||||||
public static final String FLAVOR = "";
|
|
||||||
public static final int VERSION_CODE = 1;
|
|
||||||
public static final String VERSION_NAME = "0.1";
|
|
||||||
}
|
|
|
@ -1,328 +0,0 @@
|
||||||
/* AUTO-GENERATED FILE. DO NOT MODIFY.
|
|
||||||
*
|
|
||||||
* This class was automatically generated by the
|
|
||||||
* aapt tool from the resource data it found. It
|
|
||||||
* should not be modified by hand.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.micode.notes;
|
|
||||||
|
|
||||||
public final class R {
|
|
||||||
public static final class array {
|
|
||||||
/** format_note_content
|
|
||||||
*/
|
|
||||||
public static final int format_for_exported_note=0x7f060001;
|
|
||||||
public static final int menu_share_ways=0x7f060000;
|
|
||||||
}
|
|
||||||
public static final class attr {
|
|
||||||
}
|
|
||||||
public static final class color {
|
|
||||||
public static final int primary_text_dark=0x7f090001;
|
|
||||||
public static final int secondary_text_dark=0x7f090002;
|
|
||||||
public static final int user_query_highlight=0x7f090000;
|
|
||||||
}
|
|
||||||
public static final class dimen {
|
|
||||||
public static final int text_font_size_large=0x7f0a0000;
|
|
||||||
public static final int text_font_size_medium=0x7f0a0001;
|
|
||||||
public static final int text_font_size_normal=0x7f0a0002;
|
|
||||||
public static final int text_font_size_small=0x7f0a0003;
|
|
||||||
public static final int text_font_size_super=0x7f0a0004;
|
|
||||||
}
|
|
||||||
public static final class drawable {
|
|
||||||
public static final int bg_btn_set_color=0x7f020000;
|
|
||||||
public static final int bg_color_btn_mask=0x7f020001;
|
|
||||||
public static final int call_record=0x7f020002;
|
|
||||||
public static final int clock=0x7f020003;
|
|
||||||
public static final int delete=0x7f020004;
|
|
||||||
public static final int dropdown_icon=0x7f020005;
|
|
||||||
public static final int edit_blue=0x7f020006;
|
|
||||||
public static final int edit_green=0x7f020007;
|
|
||||||
public static final int edit_red=0x7f020008;
|
|
||||||
public static final int edit_title_blue=0x7f020009;
|
|
||||||
public static final int edit_title_green=0x7f02000a;
|
|
||||||
public static final int edit_title_red=0x7f02000b;
|
|
||||||
public static final int edit_title_white=0x7f02000c;
|
|
||||||
public static final int edit_title_yellow=0x7f02000d;
|
|
||||||
public static final int edit_white=0x7f02000e;
|
|
||||||
public static final int edit_yellow=0x7f02000f;
|
|
||||||
public static final int font_large=0x7f020010;
|
|
||||||
public static final int font_normal=0x7f020011;
|
|
||||||
public static final int font_size_selector_bg=0x7f020012;
|
|
||||||
public static final int font_small=0x7f020013;
|
|
||||||
public static final int font_super=0x7f020014;
|
|
||||||
public static final int icon_app=0x7f020015;
|
|
||||||
public static final int list_background=0x7f020016;
|
|
||||||
public static final int list_blue_down=0x7f020017;
|
|
||||||
public static final int list_blue_middle=0x7f020018;
|
|
||||||
public static final int list_blue_single=0x7f020019;
|
|
||||||
public static final int list_blue_up=0x7f02001a;
|
|
||||||
public static final int list_folder=0x7f02001b;
|
|
||||||
public static final int list_footer_bg=0x7f02001c;
|
|
||||||
public static final int list_green_down=0x7f02001d;
|
|
||||||
public static final int list_green_middle=0x7f02001e;
|
|
||||||
public static final int list_green_single=0x7f02001f;
|
|
||||||
public static final int list_green_up=0x7f020020;
|
|
||||||
public static final int list_red_down=0x7f020021;
|
|
||||||
public static final int list_red_middle=0x7f020022;
|
|
||||||
public static final int list_red_single=0x7f020023;
|
|
||||||
public static final int list_red_up=0x7f020024;
|
|
||||||
public static final int list_white_down=0x7f020025;
|
|
||||||
public static final int list_white_middle=0x7f020026;
|
|
||||||
public static final int list_white_single=0x7f020027;
|
|
||||||
public static final int list_white_up=0x7f020028;
|
|
||||||
public static final int list_yellow_down=0x7f020029;
|
|
||||||
public static final int list_yellow_middle=0x7f02002a;
|
|
||||||
public static final int list_yellow_single=0x7f02002b;
|
|
||||||
public static final int list_yellow_up=0x7f02002c;
|
|
||||||
public static final int menu_delete=0x7f02002d;
|
|
||||||
public static final int menu_move=0x7f02002e;
|
|
||||||
public static final int new_note=0x7f02002f;
|
|
||||||
public static final int new_note_normal=0x7f020030;
|
|
||||||
public static final int new_note_pressed=0x7f020031;
|
|
||||||
public static final int note_edit_color_selector_panel=0x7f020032;
|
|
||||||
public static final int notification=0x7f020033;
|
|
||||||
public static final int search_result=0x7f020034;
|
|
||||||
public static final int selected=0x7f020035;
|
|
||||||
public static final int splash=0x7f020036;
|
|
||||||
public static final int title_alert=0x7f020037;
|
|
||||||
public static final int title_bar_bg=0x7f020038;
|
|
||||||
public static final int widget_2x_blue=0x7f020039;
|
|
||||||
public static final int widget_2x_green=0x7f02003a;
|
|
||||||
public static final int widget_2x_red=0x7f02003b;
|
|
||||||
public static final int widget_2x_white=0x7f02003c;
|
|
||||||
public static final int widget_2x_yellow=0x7f02003d;
|
|
||||||
public static final int widget_4x_blue=0x7f02003e;
|
|
||||||
public static final int widget_4x_green=0x7f02003f;
|
|
||||||
public static final int widget_4x_red=0x7f020040;
|
|
||||||
public static final int widget_4x_white=0x7f020041;
|
|
||||||
public static final int widget_4x_yellow=0x7f020042;
|
|
||||||
}
|
|
||||||
public static final class id {
|
|
||||||
public static final int account_dialog_subtitle=0x7f0d0001;
|
|
||||||
public static final int account_dialog_title=0x7f0d0000;
|
|
||||||
public static final int action_select_all=0x7f0d0042;
|
|
||||||
public static final int amPm=0x7f0d0005;
|
|
||||||
public static final int btn_new_note=0x7f0d002d;
|
|
||||||
public static final int btn_set_bg_color=0x7f0d000f;
|
|
||||||
public static final int cb_edit_item=0x7f0d0024;
|
|
||||||
public static final int date=0x7f0d0002;
|
|
||||||
public static final int delete=0x7f0d0044;
|
|
||||||
public static final int et_edit_text=0x7f0d0025;
|
|
||||||
public static final int et_foler_name=0x7f0d0006;
|
|
||||||
public static final int font_size_selector=0x7f0d001b;
|
|
||||||
public static final int gestureOverlayView=0x7f0d002b;
|
|
||||||
public static final int hour=0x7f0d0003;
|
|
||||||
public static final int iv_alert_icon=0x7f0d000a;
|
|
||||||
public static final int iv_bg_blue=0x7f0d0013;
|
|
||||||
public static final int iv_bg_blue_select=0x7f0d0014;
|
|
||||||
public static final int iv_bg_green=0x7f0d0017;
|
|
||||||
public static final int iv_bg_green_select=0x7f0d0018;
|
|
||||||
public static final int iv_bg_red=0x7f0d0019;
|
|
||||||
public static final int iv_bg_red_select=0x7f0d001a;
|
|
||||||
public static final int iv_bg_white=0x7f0d0015;
|
|
||||||
public static final int iv_bg_white_select=0x7f0d0016;
|
|
||||||
public static final int iv_bg_yellow=0x7f0d0011;
|
|
||||||
public static final int iv_bg_yellow_select=0x7f0d0012;
|
|
||||||
public static final int iv_large_select=0x7f0d0021;
|
|
||||||
public static final int iv_medium_select=0x7f0d001f;
|
|
||||||
public static final int iv_small_select=0x7f0d001d;
|
|
||||||
public static final int iv_super_select=0x7f0d0023;
|
|
||||||
public static final int ll_font_large=0x7f0d0020;
|
|
||||||
public static final int ll_font_normal=0x7f0d001e;
|
|
||||||
public static final int ll_font_small=0x7f0d001c;
|
|
||||||
public static final int ll_font_super=0x7f0d0022;
|
|
||||||
public static final int menu_alert=0x7f0d003a;
|
|
||||||
public static final int menu_delete=0x7f0d0035;
|
|
||||||
public static final int menu_delete_remind=0x7f0d003b;
|
|
||||||
public static final int menu_export_text=0x7f0d003f;
|
|
||||||
public static final int menu_font_size=0x7f0d0036;
|
|
||||||
public static final int menu_list_mode=0x7f0d0037;
|
|
||||||
public static final int menu_new_folder=0x7f0d003e;
|
|
||||||
public static final int menu_new_note=0x7f0d003d;
|
|
||||||
public static final int menu_search=0x7f0d003c;
|
|
||||||
public static final int menu_send_to_desktop=0x7f0d0039;
|
|
||||||
public static final int menu_setting=0x7f0d0041;
|
|
||||||
public static final int menu_share=0x7f0d0038;
|
|
||||||
public static final int menu_sync=0x7f0d0040;
|
|
||||||
public static final int minute=0x7f0d0004;
|
|
||||||
public static final int move=0x7f0d0043;
|
|
||||||
public static final int navigation_bar=0x7f0d002e;
|
|
||||||
public static final int note_bg_color_selector=0x7f0d0010;
|
|
||||||
public static final int note_edit_list=0x7f0d000e;
|
|
||||||
public static final int note_edit_view=0x7f0d000d;
|
|
||||||
public static final int note_item=0x7f0d0026;
|
|
||||||
public static final int note_title=0x7f0d0008;
|
|
||||||
public static final int notes_list=0x7f0d002c;
|
|
||||||
public static final int prefenerece_sync_status_textview=0x7f0d0031;
|
|
||||||
public static final int preference_sync_button=0x7f0d0030;
|
|
||||||
public static final int selection_menu=0x7f0d002f;
|
|
||||||
public static final int sv_note_edit=0x7f0d000c;
|
|
||||||
public static final int tv_alert_date=0x7f0d000b;
|
|
||||||
public static final int tv_folder_name=0x7f0d0007;
|
|
||||||
public static final int tv_modified_date=0x7f0d0009;
|
|
||||||
public static final int tv_name=0x7f0d0027;
|
|
||||||
public static final int tv_time=0x7f0d0029;
|
|
||||||
public static final int tv_title=0x7f0d0028;
|
|
||||||
public static final int tv_title_bar=0x7f0d002a;
|
|
||||||
public static final int versionNumber=0x7f0d0032;
|
|
||||||
public static final int widget_bg_image=0x7f0d0033;
|
|
||||||
public static final int widget_text=0x7f0d0034;
|
|
||||||
}
|
|
||||||
public static final class layout {
|
|
||||||
public static final int account_dialog_title=0x7f030000;
|
|
||||||
public static final int add_account_text=0x7f030001;
|
|
||||||
public static final int datetime_picker=0x7f030002;
|
|
||||||
public static final int dialog_edit_text=0x7f030003;
|
|
||||||
public static final int folder_list_item=0x7f030004;
|
|
||||||
public static final int note_edit=0x7f030005;
|
|
||||||
public static final int note_edit_list_item=0x7f030006;
|
|
||||||
public static final int note_item=0x7f030007;
|
|
||||||
public static final int note_list=0x7f030008;
|
|
||||||
public static final int note_list_dropdown_menu=0x7f030009;
|
|
||||||
public static final int note_list_footer=0x7f03000a;
|
|
||||||
public static final int settings_header=0x7f03000b;
|
|
||||||
public static final int splash=0x7f03000c;
|
|
||||||
public static final int widget_2x=0x7f03000d;
|
|
||||||
public static final int widget_4x=0x7f03000e;
|
|
||||||
}
|
|
||||||
public static final class menu {
|
|
||||||
public static final int call_note_edit=0x7f0c0000;
|
|
||||||
public static final int call_record_folder=0x7f0c0001;
|
|
||||||
public static final int note_edit=0x7f0c0002;
|
|
||||||
public static final int note_list=0x7f0c0003;
|
|
||||||
public static final int note_list_dropdown=0x7f0c0004;
|
|
||||||
public static final int note_list_options=0x7f0c0005;
|
|
||||||
public static final int sub_folder=0x7f0c0006;
|
|
||||||
}
|
|
||||||
public static final class plurals {
|
|
||||||
public static final int search_results_title=0x7f070000;
|
|
||||||
}
|
|
||||||
public static final class raw {
|
|
||||||
public static final int gestures=0x7f050000;
|
|
||||||
public static final int introduction=0x7f050001;
|
|
||||||
}
|
|
||||||
public static final class string {
|
|
||||||
public static final int alert_message_delete_folder=0x7f080000;
|
|
||||||
public static final int alert_message_delete_note=0x7f080001;
|
|
||||||
public static final int alert_message_delete_notes=0x7f080002;
|
|
||||||
public static final int alert_title_delete=0x7f080003;
|
|
||||||
public static final int app_name=0x7f080004;
|
|
||||||
public static final int app_widget2x2=0x7f080005;
|
|
||||||
public static final int app_widget4x4=0x7f080006;
|
|
||||||
public static final int button_delete=0x7f080007;
|
|
||||||
public static final int call_record_folder_name=0x7f080008;
|
|
||||||
public static final int datetime_dialog_cancel=0x7f080009;
|
|
||||||
public static final int datetime_dialog_ok=0x7f08000a;
|
|
||||||
public static final int delete_remind_time_message=0x7f08000b;
|
|
||||||
public static final int error_note_empty_for_clock=0x7f08000c;
|
|
||||||
public static final int error_note_empty_for_send_to_desktop=0x7f08000d;
|
|
||||||
public static final int error_note_not_exist=0x7f08000e;
|
|
||||||
public static final int error_sdcard_export=0x7f08000f;
|
|
||||||
public static final int error_sdcard_unmounted=0x7f080010;
|
|
||||||
public static final int error_sync_cancelled=0x7f080011;
|
|
||||||
public static final int error_sync_internal=0x7f080012;
|
|
||||||
public static final int error_sync_network=0x7f080013;
|
|
||||||
public static final int failed_sdcard_export=0x7f080014;
|
|
||||||
public static final int file_name_txt_format=0x7f080062;
|
|
||||||
public static final int file_path=0x7f080063;
|
|
||||||
public static final int folder_exist=0x7f080015;
|
|
||||||
public static final int format_date_ymd=0x7f080016;
|
|
||||||
public static final int format_datetime_mdhm=0x7f080017;
|
|
||||||
public static final int format_exported_file_location=0x7f080018;
|
|
||||||
public static final int format_folder_files_count=0x7f080064;
|
|
||||||
public static final int format_move_notes_to_folder=0x7f080019;
|
|
||||||
public static final int hint_foler_name=0x7f08001a;
|
|
||||||
public static final int info_note_enter_desktop=0x7f08001b;
|
|
||||||
public static final int menu_alert=0x7f08001c;
|
|
||||||
public static final int menu_create_folder=0x7f08001d;
|
|
||||||
public static final int menu_delete=0x7f08001e;
|
|
||||||
public static final int menu_deselect_all=0x7f08001f;
|
|
||||||
public static final int menu_export_text=0x7f080020;
|
|
||||||
public static final int menu_folder_change_name=0x7f080021;
|
|
||||||
public static final int menu_folder_delete=0x7f080022;
|
|
||||||
public static final int menu_folder_view=0x7f080023;
|
|
||||||
public static final int menu_font_large=0x7f080024;
|
|
||||||
public static final int menu_font_normal=0x7f080025;
|
|
||||||
public static final int menu_font_size=0x7f080026;
|
|
||||||
public static final int menu_font_small=0x7f080027;
|
|
||||||
public static final int menu_font_super=0x7f080028;
|
|
||||||
public static final int menu_list_mode=0x7f080029;
|
|
||||||
public static final int menu_move=0x7f08002a;
|
|
||||||
public static final int menu_move_parent_folder=0x7f08002b;
|
|
||||||
public static final int menu_normal_mode=0x7f08002c;
|
|
||||||
public static final int menu_remove_remind=0x7f08002d;
|
|
||||||
public static final int menu_search=0x7f08002e;
|
|
||||||
public static final int menu_select_all=0x7f08002f;
|
|
||||||
public static final int menu_select_none=0x7f080030;
|
|
||||||
public static final int menu_select_title=0x7f080031;
|
|
||||||
public static final int menu_send_to_desktop=0x7f080032;
|
|
||||||
public static final int menu_setting=0x7f080033;
|
|
||||||
public static final int menu_share=0x7f080034;
|
|
||||||
public static final int menu_sync=0x7f080035;
|
|
||||||
public static final int menu_sync_cancel=0x7f080036;
|
|
||||||
public static final int menu_title_select_folder=0x7f080037;
|
|
||||||
public static final int note_alert_expired=0x7f080038;
|
|
||||||
public static final int note_link_email=0x7f080039;
|
|
||||||
public static final int note_link_other=0x7f08003a;
|
|
||||||
public static final int note_link_tel=0x7f08003b;
|
|
||||||
public static final int note_link_web=0x7f08003c;
|
|
||||||
public static final int notealert_enter=0x7f08003d;
|
|
||||||
public static final int notealert_ok=0x7f08003e;
|
|
||||||
public static final int notelist_menu_new=0x7f08003f;
|
|
||||||
public static final int notelist_string_info=0x7f080040;
|
|
||||||
public static final int preferences_account_summary=0x7f080041;
|
|
||||||
public static final int preferences_account_title=0x7f080042;
|
|
||||||
public static final int preferences_add_account=0x7f080043;
|
|
||||||
public static final int preferences_bg_random_appear_title=0x7f080044;
|
|
||||||
public static final int preferences_button_sync_cancel=0x7f080045;
|
|
||||||
public static final int preferences_button_sync_immediately=0x7f080046;
|
|
||||||
public static final int preferences_dialog_change_account_title=0x7f080047;
|
|
||||||
public static final int preferences_dialog_change_account_warn_msg=0x7f080048;
|
|
||||||
public static final int preferences_dialog_select_account_tips=0x7f080049;
|
|
||||||
public static final int preferences_dialog_select_account_title=0x7f08004a;
|
|
||||||
public static final int preferences_last_sync_time=0x7f08004b;
|
|
||||||
public static final int preferences_last_sync_time_format=0x7f080065;
|
|
||||||
public static final int preferences_menu_cancel=0x7f08004c;
|
|
||||||
public static final int preferences_menu_change_account=0x7f08004d;
|
|
||||||
public static final int preferences_menu_remove_account=0x7f08004e;
|
|
||||||
public static final int preferences_title=0x7f08004f;
|
|
||||||
public static final int preferences_toast_cannot_change_account=0x7f080050;
|
|
||||||
public static final int preferences_toast_success_set_accout=0x7f080051;
|
|
||||||
public static final int search=0x7f080052;
|
|
||||||
public static final int search_hint=0x7f080053;
|
|
||||||
public static final int search_label=0x7f080054;
|
|
||||||
public static final int search_setting_description=0x7f080055;
|
|
||||||
public static final int set_remind_time_message=0x7f080056;
|
|
||||||
public static final int success_sdcard_export=0x7f080057;
|
|
||||||
public static final int success_sync_account=0x7f080058;
|
|
||||||
public static final int sync_progress_init_list=0x7f080059;
|
|
||||||
public static final int sync_progress_login=0x7f08005a;
|
|
||||||
public static final int sync_progress_syncing=0x7f08005b;
|
|
||||||
public static final int ticker_cancel=0x7f08005c;
|
|
||||||
public static final int ticker_fail=0x7f08005d;
|
|
||||||
public static final int ticker_success=0x7f08005e;
|
|
||||||
public static final int ticker_syncing=0x7f08005f;
|
|
||||||
public static final int widget_havenot_content=0x7f080060;
|
|
||||||
public static final int widget_under_visit_mode=0x7f080061;
|
|
||||||
}
|
|
||||||
public static final class style {
|
|
||||||
public static final int HighlightTextAppearancePrimary=0x7f0b0000;
|
|
||||||
public static final int HighlightTextAppearanceSecondary=0x7f0b0001;
|
|
||||||
public static final int NoteActionBarStyle=0x7f0b0002;
|
|
||||||
public static final int NoteTheme=0x7f0b0003;
|
|
||||||
public static final int TextAppearanceLarge=0x7f0b0004;
|
|
||||||
public static final int TextAppearanceMedium=0x7f0b0005;
|
|
||||||
public static final int TextAppearanceNormal=0x7f0b0006;
|
|
||||||
public static final int TextAppearancePrimaryItem=0x7f0b0007;
|
|
||||||
public static final int TextAppearanceSecondaryItem=0x7f0b0008;
|
|
||||||
public static final int TextAppearanceSuper=0x7f0b0009;
|
|
||||||
public static final int TextAppearanceUnderMenuIcon=0x7f0b000a;
|
|
||||||
public static final int TitleBarTextView=0x7f0b000b;
|
|
||||||
}
|
|
||||||
public static final class xml {
|
|
||||||
public static final int preferences=0x7f040000;
|
|
||||||
public static final int searchable=0x7f040001;
|
|
||||||
public static final int widget_2x_info=0x7f040002;
|
|
||||||
public static final int widget_4x_info=0x7f040003;
|
|
||||||
}
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1,10 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\color\\secondary_text_dark.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\color\\secondary_text_dark.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\color\\primary_text_dark.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\color\\primary_text_dark.xml"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,266 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_middle.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_middle.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_yellow.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_yellow.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_blue.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_blue.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_down.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_down.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\call_record.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\call_record.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_red.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_red.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_yellow.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_yellow.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_single.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_single.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_green.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_green.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_up.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_up.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_white.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_white.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\delete.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\delete.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\splash.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\splash.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_folder.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_folder.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_yellow.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_yellow.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_up.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_up.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_single.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_single.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_middle.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_middle.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_green.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_green.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\new_note_pressed.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\new_note_pressed.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\clock.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\clock.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_down.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_down.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_footer_bg.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_footer_bg.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_green.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_green.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_blue.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_blue.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_title_yellow.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_title_yellow.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_green.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_green.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_white.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_white.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_blue.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_blue.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_super.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_super.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_up.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_up.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_red.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_red.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_up.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_up.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\edit_red.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\edit_red.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\title_bar_bg.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\title_bar_bg.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_single.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_single.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\dropdown_icon.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\dropdown_icon.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_small.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_small.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_red_middle.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_red_middle.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_down.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_down.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_single.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_single.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_size_selector_bg.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_size_selector_bg.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_normal.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_normal.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_yellow_down.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_yellow_down.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_blue.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_blue.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\new_note_normal.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\new_note_normal.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bg_color_btn_mask.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\bg_color_btn_mask.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_4x_white.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_4x_white.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\icon_app.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\icon_app.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_white.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_white.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_up.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_up.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_down.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_down.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_white_single.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_white_single.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\menu_move.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\menu_move.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_blue_middle.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_blue_middle.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_green_middle.9.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_green_middle.9.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\menu_delete.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\menu_delete.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\list_background.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\list_background.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bg_btn_set_color.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\bg_btn_set_color.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\font_large.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\font_large.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\search_result.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\search_result.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\widget_2x_red.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\widget_2x_red.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\title_alert.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\title_alert.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\notification.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\notification.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\note_edit_color_selector_panel.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\note_edit_color_selector_panel.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\selected.png",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable-hdpi\\selected.png"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,6 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\new_note.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\drawable\\new_note.xml"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,62 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\settings_header.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\settings_header.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\account_dialog_title.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\account_dialog_title.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_edit.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_edit.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\widget_4x.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\widget_4x.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\add_account_text.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\add_account_text.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\datetime_picker.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\datetime_picker.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\dialog_edit_text.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\dialog_edit_text.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list_dropdown_menu.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list_dropdown_menu.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_list_footer.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_list_footer.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_edit_list_item.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_edit_list_item.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\folder_list_item.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\folder_list_item.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\splash.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\splash.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\note_item.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\note_item.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\layout\\widget_2x.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\layout\\widget_2x.xml"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,30 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\call_record_folder.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\call_record_folder.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\call_note_edit.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\call_note_edit.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_edit.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_edit.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list_dropdown.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list_dropdown.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\sub_folder.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\sub_folder.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list_options.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list_options.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\menu\\note_list.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\menu\\note_list.xml"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,6 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw-zh-rCN\\introduction",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw-zh-rCN\\introduction"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,10 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw\\gestures",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw\\gestures"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\raw\\introduction",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\raw\\introduction"
|
|
||||||
}
|
|
||||||
]
|
|
|
@ -1,18 +0,0 @@
|
||||||
[
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\preferences.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\preferences.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\widget_2x_info.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\widget_2x_info.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\widget_4x_info.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\widget_4x_info.xml"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"merged": "F:\\Notesmaster-add\\Notes-master-original\\app\\build\\intermediates\\res\\merged\\debug\\xml\\searchable.xml",
|
|
||||||
"source": "F:\\Notesmaster-add\\Notes-master-original\\app\\src\\main\\res\\xml\\searchable.xml"
|
|
||||||
}
|
|
||||||
]
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue