李明 / ClasManage · 提交

转到一个项目

作者 朱振飞
提交 53d0996e3da69b5fa57ff5849ed4d8a389ebdbca 1 个父辈 3183cf55

add

内嵌 并排对比
正在显示 35 个修改的文件 包含 398 行增加 和 294 行删除
... ... @@ -3,10 +3,10 @@ package com.yinhebairong.clasmanage;
public class Config {
public static int RUN_MODE = 1; // 0 测试 1 正式
public static final String BASE_IP = "http://class.ynsdfx.com";//正式服务器
// public static final String BASE_IP = "http://ctest.ynsdfx.com";//测试服务器
public static final String LOGIN_IP="http://school.hzpark.com";//登录的
// public static final String LOGIN_IP="http://api.ynsdfx.com";//登录的
// public static final String BASE_IP = "http://class.ynsdfx.com";//正式服务器
public static final String BASE_IP = "http://ctest.ynsdfx.com";//测试服务器
// public static final String LOGIN_IP="http://school.hzpark.com";//登录的
public static final String LOGIN_IP="http://api.ynsdfx.com";//登录的
public static final String YNSDFX_IP = "http://api.ynsdfx.com";//云附小服务器
// public static final String BASE_IP = "http://tusmartedu.w.brotop.cn";//测试服务器
public static String USE_URL = (RUN_MODE == 0 ? LOGIN_IP : BASE_IP);
... ...
... ... @@ -59,7 +59,7 @@ public class BjListEntity {
private String class_id;
private String class_name;
private int grade_name;
private boolean isCheck = false;
private boolean isCheck = true;
public boolean isCheck() {
return isCheck;
... ...
... ... @@ -65,7 +65,7 @@ public class getClassListEntity implements Serializable {
private String short_class_name;
private List<TeacherBean> teacher;
private List<ParentBean> parent;
private boolean isChecked;
private boolean isChecked=true;
private boolean isShow;
private boolean isHave;
... ... @@ -154,7 +154,7 @@ public class getClassListEntity implements Serializable {
private String teacher_name;
private String photo;
private String short_class_name;
private boolean isChecked;
private boolean isChecked=true;
public String getId() {
return id;
... ... @@ -210,7 +210,7 @@ public class getClassListEntity implements Serializable {
private String student_name;
private String photo;
private int week_score;
private boolean isChecked;
private boolean isChecked=true;
public boolean isChecked() {
return isChecked;
... ...
... ... @@ -65,7 +65,7 @@ public class getClassPersonListEntity implements Serializable {
private String short_class_name;
private List<TeacherBean> teacher;
private List<StudentBean> student;
private boolean isChecked;
private boolean isChecked=true;
private boolean isShow;
private boolean isHave;
... ... @@ -152,7 +152,7 @@ public class getClassPersonListEntity implements Serializable {
private String id;
private String teacher_name;
private String photo;
private boolean isChecked;
private boolean isChecked=true;
public boolean isChecked() {
return isChecked;
}
... ... @@ -211,7 +211,7 @@ public class getClassPersonListEntity implements Serializable {
private String photo;
private String gender;
private int week_score;
private boolean isChecked;
private boolean isChecked=true;
public boolean isChecked() {
return isChecked;
... ...
... ... @@ -625,6 +625,7 @@ public class BjwjActivity extends BaseActivity {
.start(BjwjActivity.this, PhoenixOption.TYPE_PICK_MEDIA, REQUEST_CODE);
}
});
pic_audio.setVisibility(View.GONE);
pic_audio.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
... ...
... ... @@ -206,7 +206,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
if (valueA.equals("0") && valueB.equals("0")) { // 取消
dismiss();
} else { // 确定
start_date=valueA;
start_date = valueA;
qj_start_time.setText(valueA + " " + valueB);
calculationDays();
dismiss();
... ... @@ -223,7 +223,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
if (valueA.equals("0") && valueB.equals("0")) { // 取消
dismiss();
} else { // 确定
end_date=valueA;
end_date = valueA;
qj_end_time.setText(valueA + " " + valueB);
calculationDays();
dismiss();
... ... @@ -297,7 +297,6 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
}
/*--------------------------------------------查看大图详情----------------------------------------------------------*/
float x1 = 0, x2 = 0; // 滑动坐标轴
int pageSze; // 页数
... ... @@ -306,6 +305,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
/**
* 显示图片和视频的pop
*
* @param imgList 要显示的列表
* @param pageSze1 显示位置
*/
... ... @@ -428,6 +428,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
});
}
private void setplay(GSYVideoOptionBuilder gsyVideoOption, String url) {
gsyVideoOption
.setIsTouchWiget(true)
... ... @@ -459,14 +460,15 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
player.startPlayLogic();
}
/**
* 提交
*/
private void commit() {
String image=TextUtils.join(",", ImagesUrl);
String image = TextUtils.join(",", ImagesUrl);
Api().publishLeave(Config.Token, Config.id, leave_type,
start_date, end_date, day,
qj_xq.getText().toString(),image)
qj_xq.getText().toString(), image)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<BaseBean>() {
... ... @@ -479,7 +481,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
Log.e("onNext==", "1");
if (teacherInfoBean.getCode() == M.success) {
Qj_Rv_Fragment.DO_REFRESH = true;
All_Fragment.DO_REFRESH=true;
All_Fragment.DO_REFRESH = true;
Toast.makeText(Fbdc_Activity.this, teacherInfoBean.getMsg(), Toast.LENGTH_SHORT).show();
finish();
} else {
... ... @@ -503,7 +505,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
private void calculationDays() {
if (qj_end_time.getText().toString().length() > 0 && qj_start_time.getText().toString().length() > 0) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// String endtime = qj_end_time.getText().toString()
// .replace("年", "-")
// .replace("月", "-").replace("日", "-");
... ... @@ -519,6 +521,10 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
String jieshu = qj_end_time.getText().toString().substring(qj_end_time.getText().toString().length() - 2, qj_end_time.getText().toString().length());
DebugLog.e("shijian==kaishi===" + kaishi);
DebugLog.e("shijian==jieshu===" + jieshu);
String start;
String end;
double addDay = 0;
if (kaishi.equals(jieshu)) {
addDay = 0.5;
... ... @@ -526,26 +532,28 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
addDay = 1;
}
if (kaishi.equals("上午")) {
start_date = start_date + " 08:00";
start = start_date + " 08:00";
} else {
start_date = start_date + " 18:00";
start = start_date + " 18:00";
}
if (jieshu.equals("上午")) {
end_date = end_date + " 08:00";
end = end_date + " 08:00";
} else {
end_date = end_date + " 18:00";
end = end_date + " 18:00";
}
try {
Date dateEnd = format.parse(end_date);
Date datestart = format.parse(start_date);
Date dateEnd = format.parse(end);
Date datestart = format.parse(start);
Calendar endCalendar = Calendar.getInstance();
endCalendar.setTime(dateEnd);
Calendar beginCalendar = Calendar.getInstance();
beginCalendar.setTime(datestart);
long beginTime = beginCalendar.getTime().getTime();
long endTime = endCalendar.getTime().getTime();
long beginTime = beginCalendar.getTimeInMillis();
long endTime = endCalendar.getTimeInMillis();
long betweenDays = (long) ((endTime - beginTime) / (1000 * 60 * 60 * 24));
DebugLog.e("shijian==endtimebetweenDays===" + (betweenDays + addDay));
day = Float.valueOf(String.valueOf(betweenDays + addDay));
tv_day.setText(String.valueOf(betweenDays + addDay) + "天");
} catch (ParseException e) {
... ... @@ -632,6 +640,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
}
});
}
/**
* 处理权限申请的回调。
*
... ... @@ -641,7 +650,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
*/
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
DebugLog.e("onRequestPermissionsResult----"+requestCode);
DebugLog.e("onRequestPermissionsResult----" + requestCode);
if (requestCode == PERMISSION_WRITE_EXTERNAL_REQUEST_CODE) {
if (grantResults.length > 0
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
... ... @@ -694,6 +703,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
DebugLog.e("压缩后===" + FilesUtil.getFileOrFilesSize(file.getAbsolutePath(), 3));
postFile(file.getAbsolutePath(), 1, "");
}
@Override
public void onError(Throwable e) {
// TODO 当压缩过程出现问题时调用
... ... @@ -735,6 +745,7 @@ public class Fbdc_Activity extends BaseActivity implements OnOptionsSelectListen
});
}
// 隐藏输入键盘
public void hintKbTwo() {
KeyBoardUtils.closeKeybord(qj_xq, this);
... ...
... ... @@ -66,7 +66,7 @@ public class Qj_Rv_Fragment extends BaseFragment {
private TimePickerView mTimePicker3;//三级时间 年月日
//参数
private int page = 1;
private int pageNum = 1;
private List<QjLBBean.DataBeanX.DataBean> mList = new ArrayList<>();
@Override
... ... @@ -75,18 +75,14 @@ public class Qj_Rv_Fragment extends BaseFragment {
dataRv.setLayoutManager(new LinearLayoutManager(getActivity()));
dataRv.setAdapter(mJxt_Qj_Adapter);
Calendar calendar = Calendar.getInstance();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
String dateString = simpleDateFormat.format(calendar.getTime());
tv_time.setText(dateString);
tv_week.setText(MyDataFormatUtil.dateToWeek(dateString));
setToday();
mTimePicker3 = new TimePickerBuilder(getActivity(), new OnTimeSelectListener() {
@Override
public void onTimeSelect(String date, View v) {
tv_time.setText(date);
tv_week.setText(MyDataFormatUtil.dateToWeek(date));
setParam(1);
setParam(1, true);
}
}).setType(new boolean[]{true, true, true, false, false, false}).isDialog(false).setFormat("yyyy-MM-dd").setSelectChangeListener().
setTextXOffset(40, 0, -40, 0, 0, 0).build();
... ... @@ -104,7 +100,7 @@ public class Qj_Rv_Fragment extends BaseFragment {
}
});
setRefresh();
setParam(1);
setParam(1, true);
}
private void setRefresh() {
... ... @@ -112,7 +108,7 @@ public class Qj_Rv_Fragment extends BaseFragment {
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
//刷新数据
setParam(1);
setParam(1, true);
refreshLayout.finishRefresh(1000);
}
});
... ... @@ -120,7 +116,7 @@ public class Qj_Rv_Fragment extends BaseFragment {
@Override
public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
//加载数据
setParam(page);
setParam(pageNum, true);
refreshLayout.finishLoadMore(1000);
}
});
... ... @@ -131,6 +127,7 @@ public class Qj_Rv_Fragment extends BaseFragment {
mJxt_Qj_Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
locationPosition = position;
Intent intent = new Intent();
intent.setClass(getActivity(), QJxq_Activity.class);
List<QjLBBean.DataBeanX.DataBean> data = adapter.getData();
... ... @@ -167,9 +164,9 @@ public class Qj_Rv_Fragment extends BaseFragment {
* @param type
* @param date 2020-04-01 日期
*/
public void getDate(int type, String date) {
public void getDate(int type, String date, int pages) {
DebugLog.e("wkk3====" + DO_REFRESH);
Api().getQjDateList(Config.Token, type, date, page)
Api().getQjDateList(Config.Token, type, date, pages)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<QjLBBean>() {
... ... @@ -181,13 +178,24 @@ public class Qj_Rv_Fragment extends BaseFragment {
@Override
public void onNext(QjLBBean jxtZyListEntity) {
if (jxtZyListEntity.getCode() == M.success) {
if (page == 1 || page == 0) {
dataRv.scrollToPosition(0);
if (pageNum == 1 || pageNum == 0) {
if (DO_REFRESH) {
dataRv.scrollToPosition(0);
}
mList.clear();
} else {
if (locationPage != -1) {
int yushu = locationPosition % QuantityPerPage;
mList.set(locationPosition, jxtZyListEntity.getData().getData().get(yushu));
locationPage = -1;
locationPosition = -1;
mJxt_Qj_Adapter.notifyDataSetChanged();
return;
}
}
mList.addAll(jxtZyListEntity.getData().getData());
page = jxtZyListEntity.getData().getCurrent_page() + 1;
pageNum = jxtZyListEntity.getData().getCurrent_page() + 1;
if (jxtZyListEntity.getData().getPer_page() > jxtZyListEntity.getData().getData().size()) {
refresh_layout.setEnableLoadMore(false);
} else {
... ... @@ -215,8 +223,8 @@ public class Qj_Rv_Fragment extends BaseFragment {
* @param type
* @param date 2020-04-01 日期
*/
public void getParentDate(int type, String date) {
Api().getParentQjList(Config.Token, type, date, page)
public void getParentDate(int type, String date, int pages) {
Api().getParentQjList(Config.Token, type, date, pages)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Observer<QjLBBean>() {
... ... @@ -228,12 +236,24 @@ public class Qj_Rv_Fragment extends BaseFragment {
@Override
public void onNext(QjLBBean jxtZyListEntity) {
if (jxtZyListEntity.getCode() == M.success) {
if (page == 1 || page == 0) {
if (pageNum == 1 || pageNum == 0) {
if (DO_REFRESH) {
dataRv.scrollToPosition(0);
}
mList.clear();
} else {
if (locationPage != -1) {
int yushu = locationPosition % QuantityPerPage;
mList.set(locationPosition, jxtZyListEntity.getData().getData().get(yushu));
locationPage = -1;
locationPosition = -1;
mJxt_Qj_Adapter.notifyDataSetChanged();
return;
}
}
mList.addAll(jxtZyListEntity.getData().getData());
page = jxtZyListEntity.getData().getCurrent_page() + 1;
pageNum = jxtZyListEntity.getData().getCurrent_page() + 1;
if (jxtZyListEntity.getData().getPer_page() > jxtZyListEntity.getData().getData().size()) {
refresh_layout.setEnableLoadMore(false);
} else {
... ... @@ -258,41 +278,66 @@ public class Qj_Rv_Fragment extends BaseFragment {
public static boolean DO_REFRESH = false;
/**
* 时间设置为今天
*/
private void setToday() {
Calendar calendar = Calendar.getInstance();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
String dateString = simpleDateFormat.format(calendar.getTime());
tv_time.setText(dateString);
tv_week.setText(MyDataFormatUtil.dateToWeek(dateString));
}
private int locationPosition = -1;//定位替换位置
private int locationPage = -1;//定位刷新页
private int QuantityPerPage = 10;//每页数量
@Override
public void onResume() {
super.onResume();
if (DO_REFRESH) {
setToday();
setParam(1, true);
} else {
if (locationPosition >= 0) {
locationRefresh();
setParam(locationPage, false);
}
}
}
/**
* 定位刷新
*/
private void locationRefresh() {
float f = locationPosition + 1;
float c = (float) f / (float) QuantityPerPage;
locationPage = new Double(Math.ceil(c)).intValue();
}
/**
* 设置参数-请求
*
* @param page 页
* @param page 页
* @param setpage 是否把全局页码换为传入页
*/
private void setParam(int page) {
DebugLog.e("wkk2====" + DO_REFRESH);
private void setParam(int page, boolean setpage) {
DebugLog.e("zhuizong1==" + page);
if (setpage) {
pageNum = page;
}
DebugLog.e("zhuizong2==" + page);
Calendar calendar = Calendar.getInstance();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
String dateString = simpleDateFormat.format(calendar.getTime());
if (Config.IDENTITY == 0) {//老师
if (dateString.equals(tv_time.getText().toString())) {//今天
this.page = page;
getDate(7, "");
getDate(7, "",page);
} else {
this.page = page;
getDate(7, tv_time.getText().toString());
getDate(7, tv_time.getText().toString(),page);
}
} else {
if (dateString.equals(tv_time.getText().toString())) {//今天
this.page = page;
getParentDate(7, "");
getParentDate(7, "",page);
} else {
this.page = page;
getParentDate(7, tv_time.getText().toString());
getParentDate(7, tv_time.getText().toString(),page);
}
}
}
@Override
public void onResume() {
super.onResume();
if (DO_REFRESH) {
setParam(1);
DO_REFRESH = false;
}
}
}
... ...
... ... @@ -39,7 +39,7 @@ public class CalendarSelectAdapter extends RecyclerView.Adapter<RecyclerView.Vie
this.context = context;
this.list = list;
this.page = page;
initSelect();
// initSelect();
}
public void initSelect() {
... ...
... ... @@ -160,8 +160,8 @@ public class CalendarFragment extends BaseFragment {
DateBean dateBean = new DateBean();
dateBean.setType(1);//0月份 1日期
dateBean.setCenterString(String.valueOf(j + 1));//文字内容
dateBean.setSelect(true);//是否选中
dateBean.setSelectRange(true);
dateBean.setSelect(false);//是否选中
dateBean.setSelectRange(false);
dateBean.setDate(year + "-" + addZero(month) + "-" + addZero(j + 1));//日子
//今天之前不可选中
... ... @@ -179,6 +179,13 @@ public class CalendarFragment extends BaseFragment {
, TimeConstants.DAY) > 0) {//今天后
dateBean.setCanSelect(true);
}
if (TimeUtils.getTimeSpanByNow(dateBean.getDate()
, new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA)
, TimeConstants.DAY) == 0) {//今天
dateBean.setSelect(true);
}
dateList.add(dateBean);
}
... ...
... ... @@ -68,8 +68,8 @@ public class HzcjActivity extends BaseActivity {
select(0);
lists.add(new KmcjFragment());
lists.add(new CjfxFragment());
lists.add(new QmcjFragment());
// lists.add(new CjfxFragment());
// lists.add(new QmcjFragment());
pageInject(lists,hzcjPager);
hzcjPager.addOnPageChangeListener(new BaseScroll(){
... ...
... ... @@ -28,6 +28,7 @@ import com.yinhebairong.clasmanage.bean.TeacherInfoBean;
import com.yinhebairong.clasmanage.entity.ExaminationListEntity;
import com.yinhebairong.clasmanage.entity.KemuListEntity;
import com.yinhebairong.clasmanage.m.M;
import com.yinhebairong.clasmanage.ui.MainActivity;
import com.yinhebairong.clasmanage.ui.main.adapter.DropBjAdapter;
import com.yinhebairong.clasmanage.ui.main.adapter.ExaminationAdapter;
import com.yinhebairong.clasmanage.ui.main.adapter.ExaminationListAdapter;
... ... @@ -114,7 +115,9 @@ public class KmcjFragment extends BaseFragment {
RecyclerView rv = inflate.findViewById(R.id.item_xiala_recycler);
setRv(rv, 1, 0, 0);
rv.setAdapter(mExaminationListAdapter);
pop = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT - line4.getBottom());
LinearLayout viewById = inflate.findViewById(R.id.delet_layout);
// PopupWindow pop = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT, true);
pop = new PopupWindow(inflate, ViewGroup.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT - line4.getBottom());
pop.setOutsideTouchable(true);
pop.setTouchable(true);
pop.setFocusable(true);
... ... @@ -137,7 +140,12 @@ public class KmcjFragment extends BaseFragment {
break;
}
});
viewById.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
pop.dismiss();
}
});
}
/**
... ...
... ... @@ -52,6 +52,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_42"
android:visibility="gone"
android:orientation="horizontal">
<LinearLayout
... ... @@ -144,6 +145,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:background="@color/color_e3e3e3"
android:visibility="gone"
android:id="@+id/line4"
/>
<com.yinhebairong.clasmanage.widget.OptimizeViewpager
... ...
... ... @@ -37,8 +37,8 @@
android:text="账号"
android:textColor="@color/color_3d444d"
android:textSize="@dimen/sp_16" />
<!--18276570171,13888680699(戴茂义对应家长)-13888372529(双重身份) 13888777714
-15825260252（两个孩子）15925232030(老师) 13769183554(戴茂义) 寸晓丹 18687807482-->
<!--18276570171,13888680699(戴茂义对应家长)-13888372529(双重身份) 13064230586
-15825260252（两个孩子）15925232030(老师) 13769183554(戴茂义) 刘艳茗 15987125081-->
<EditText
android:id="@+id/edit_zh"
android:layout_width="@dimen/dp_0"
... ...
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_xiala_recycler"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
/>
\ No newline at end of file
android:background="#80000000"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_xiala_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />
<LinearLayout
android:id="@+id/delet_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#50FFFFFF"
android:orientation="horizontal"></LinearLayout>
</LinearLayout>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_305"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/zyfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_work"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="作业"/>
</LinearLayout>
<LinearLayout
android:id="@+id/tzfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_tongzhi"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="通知"/>
</LinearLayout>
<LinearLayout
android:id="@+id/hdfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_activity"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="活动"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/tpfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_vote"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="投票"/>
</LinearLayout>
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/dcwj_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_questionnaire"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="调查问卷"/>
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"
android:orientation="horizontal"
android:visibility="invisible">
<LinearLayout
android:id="@+id/tpfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_vote" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="投票"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/dcwj_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_questionnaire" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="调查问卷"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/jlfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_solitaire" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="接龙"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/jlfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
>
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_solitaire"/>
<TextView
android:layout_marginTop="@dimen/dp_10"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#FFFFFF"
android:text="接龙"/>
android:layout_width="match_parent"
android:layout_height="@dimen/dp_100"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/zyfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_work" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="作业"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/tzfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_tongzhi" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="通知"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<LinearLayout
android:id="@+id/hdfb_but"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_48"
android:layout_height="@dimen/dp_48"
android:src="@mipmap/icon_activity" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="活动"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/close_img"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:gravity="center"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_72"
>
android:gravity="center">
<ImageView
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:src="@mipmap/close_icon"/>
android:src="@mipmap/close_icon" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\main\assets"/><source path="F:\work\ClasManage\qrcodecore\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\assets"/><source path="D:\bro\ClasManage\qrcodecore\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
... ...
#Sun May 03 09:51:12 CST 2020
#Wed May 06 08:59:15 CST 2020
F\:\\work\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_grid_scan_line.png=F\:\\work\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_grid_scan_line.png
F\:\\work\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_scan_line.png=F\:\\work\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_scan_line.png
D\:\\bro\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_grid_scan_line.png=D\:\\bro\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_grid_scan_line.png
D\:\\bro\\ClasManage\\qrcodecore\\src\\main\\res\\mipmap-xxhdpi\\qrcode_default_scan_line.png=D\:\\bro\\ClasManage\\qrcodecore\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\qrcode_default_scan_line.png
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\main\res"/><source path="F:\work\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="F:\work\ClasManage\qrcodecore\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\main\res"><file name="qrcode_default_grid_scan_line" path="F:\work\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_grid_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="qrcode_default_scan_line" path="F:\work\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="F:\work\ClasManage\qrcodecore\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="QRCodeView">
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\res"/><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\main\res"><file name="qrcode_default_grid_scan_line" path="D:\bro\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_grid_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file name="qrcode_default_scan_line" path="D:\bro\ClasManage\qrcodecore\src\main\res\mipmap-xxhdpi\qrcode_default_scan_line.png" qualifiers="xxhdpi-v4" type="mipmap"/><file path="D:\bro\ClasManage\qrcodecore\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="QRCodeView">
<attr format="dimension|reference" name="qrcv_topOffset"/>
... ... @@ -71,7 +71,7 @@
<attr format="boolean" name="qrcv_isShowLocationPoint"/>
<attr format="boolean" name="qrcv_isAutoZoom"/>
</declare-styleable></file><file path="F:\work\ClasManage\qrcodecore\src\main\res\values\ids.xml" qualifiers=""><item name="bgaqrcode_camera_preview" type="id"/></file></source><source path="F:\work\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="F:\work\ClasManage\qrcodecore\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\qrcodecore\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="QRCodeView">
</declare-styleable></file><file path="D:\bro\ClasManage\qrcodecore\src\main\res\values\ids.xml" qualifiers=""><item name="bgaqrcode_camera_preview" type="id"/></file></source><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\qrcodecore\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\qrcodecore\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="QRCodeView">
<attr format="dimension|reference" name="qrcv_topOffset"/>
... ...
-- Merging decision tree log ---
manifest
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
package
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:2:5-44
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:versionName
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:versionCode
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:1-13:12
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
xmlns:android
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:1:11-69
uses-permission#android.permission.CAMERA
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:5-65
android:name
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:4:22-62
uses-permission#android.permission.FLASHLIGHT
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:5-69
android:name
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:5:22-66
uses-feature#android.hardware.camera.autofocus
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:7:5-9:36
android:required
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:9:9-33
android:name
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:8:9-57
uses-feature#android.hardware.camera.flash
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:10:5-12:36
android:required
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:12:9-33
android:name
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml:11:9-53
uses-sdk
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\qrcodecore\src\main\AndroidManifest.xml
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\jniLibs"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\shaders"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\main\assets"/><source path="F:\work\ClasManage\zxing\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\assets"/><source path="D:\bro\ClasManage\zxing\build\intermediates\shader_assets\debug\compileDebugShaders\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\assets"/></dataSet></merger>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\main\res"/><source path="F:\work\ClasManage\zxing\build\generated\res\rs\debug"/><source path="F:\work\ClasManage\zxing\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\main\res"/><source path="F:\work\ClasManage\zxing\build\generated\res\rs\debug"/><source path="F:\work\ClasManage\zxing\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="F:\work\ClasManage\zxing\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\res"/><source path="D:\bro\ClasManage\zxing\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\zxing\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\main\res"/><source path="D:\bro\ClasManage\zxing\build\generated\res\rs\debug"/><source path="D:\bro\ClasManage\zxing\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\bro\ClasManage\zxing\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
... ...
-- Merging decision tree log ---
manifest
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
package
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:11-51
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:versionName
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
xmlns:android
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
android:versionCode
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml:1:1-53
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
uses-sdk
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from F:\work\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
ADDED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
INJECTED from D:\bro\ClasManage\zxing\src\main\AndroidManifest.xml
... ...